From ec42c790d139049b14ee378159a54f059ec10f87 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Wed, 16 Dec 2015 13:11:26 -0800 Subject: [PATCH] Use try! instead of CliError::from_boxed This From impl has been around for awhile. --- src/bin/bench.rs | 5 +---- src/bin/build.rs | 7 +++---- src/bin/clean.rs | 7 +++---- src/bin/doc.rs | 7 ++----- src/bin/fetch.rs | 6 ++---- src/bin/generate_lockfile.rs | 6 +++--- src/bin/login.rs | 33 ++++++++++++++------------------- src/bin/new.rs | 7 +++---- src/bin/owner.rs | 6 ++---- src/bin/package.rs | 13 ++++++------- src/bin/pkgid.rs | 6 ++---- src/bin/publish.rs | 7 +++---- src/bin/read_manifest.rs | 14 +++++--------- src/bin/rustc.rs | 7 +++---- src/bin/search.rs | 7 +++---- src/bin/test.rs | 5 +---- src/bin/update.rs | 6 +++--- src/bin/yank.rs | 6 ++---- 18 files changed, 61 insertions(+), 94 deletions(-) diff --git a/src/bin/bench.rs b/src/bin/bench.rs index 6f4d5db18..691f4e33a 100644 --- a/src/bin/bench.rs +++ b/src/bin/bench.rs @@ -89,10 +89,7 @@ pub fn execute(options: Options, config: &Config) -> CliResult> { }, }; - let err = try!(ops::run_benches(&root, &ops, - &options.arg_args).map_err(|err| { - CliError::from_boxed(err, 101) - })); + let err = try!(ops::run_benches(&root, &ops, &options.arg_args)); match err { None => Ok(None), Some(err) => { diff --git a/src/bin/build.rs b/src/bin/build.rs index 6a5ca18b6..428eac4c4 100644 --- a/src/bin/build.rs +++ b/src/bin/build.rs @@ -3,7 +3,7 @@ use std::env; use cargo::ops::CompileOptions; use cargo::ops; use cargo::util::important_paths::{find_root_manifest_for_wd}; -use cargo::util::{CliResult, CliError, Config}; +use cargo::util::{CliResult, Config}; #[derive(RustcDecodable)] struct Options { @@ -85,7 +85,6 @@ pub fn execute(options: Options, config: &Config) -> CliResult> { target_rustc_args: None, }; - ops::compile(&root, &opts).map(|_| None).map_err(|err| { - CliError::from_boxed(err, 101) - }) + try!(ops::compile(&root, &opts)); + Ok(None) } diff --git a/src/bin/clean.rs b/src/bin/clean.rs index 8150917fa..e4345f843 100644 --- a/src/bin/clean.rs +++ b/src/bin/clean.rs @@ -1,7 +1,7 @@ use std::env; use cargo::ops; -use cargo::util::{CliResult, CliError, Config}; +use cargo::util::{CliResult, Config}; use cargo::util::important_paths::{find_root_manifest_for_wd}; #[derive(RustcDecodable)] @@ -49,7 +49,6 @@ pub fn execute(options: Options, config: &Config) -> CliResult> { target: options.flag_target.as_ref().map(|s| &s[..]), release: options.flag_release, }; - ops::clean(&root, &opts).map(|_| None).map_err(|err| { - CliError::from_boxed(err, 101) - }) + try!(ops::clean(&root, &opts)); + Ok(None) } diff --git a/src/bin/doc.rs b/src/bin/doc.rs index f75ac8331..651b8c39f 100644 --- a/src/bin/doc.rs +++ b/src/bin/doc.rs @@ -1,5 +1,5 @@ use cargo::ops; -use cargo::util::{CliResult, CliError, Config}; +use cargo::util::{CliResult, Config}; use cargo::util::important_paths::{find_root_manifest_for_wd}; #[derive(RustcDecodable)] @@ -74,9 +74,6 @@ pub fn execute(options: Options, config: &Config) -> CliResult> { }, }; - try!(ops::doc(&root, &doc_opts).map_err(|err| { - CliError::from_boxed(err, 101) - })); - + try!(ops::doc(&root, &doc_opts)); Ok(None) } diff --git a/src/bin/fetch.rs b/src/bin/fetch.rs index c9737571f..96d2d9541 100644 --- a/src/bin/fetch.rs +++ b/src/bin/fetch.rs @@ -1,5 +1,5 @@ use cargo::ops; -use cargo::util::{CliResult, CliError, Config}; +use cargo::util::{CliResult, Config}; use cargo::util::important_paths::find_root_manifest_for_wd; #[derive(RustcDecodable)] @@ -37,9 +37,7 @@ pub fn execute(options: Options, config: &Config) -> CliResult> { try!(config.shell().set_verbosity(options.flag_verbose, options.flag_quiet)); try!(config.shell().set_color_config(options.flag_color.as_ref().map(|s| &s[..]))); let root = try!(find_root_manifest_for_wd(options.flag_manifest_path, config.cwd())); - try!(ops::fetch(&root, config).map_err(|e| { - CliError::from_boxed(e, 101) - })); + try!(ops::fetch(&root, config)); Ok(None) } diff --git a/src/bin/generate_lockfile.rs b/src/bin/generate_lockfile.rs index 1e006bdf3..5bf4950a1 100644 --- a/src/bin/generate_lockfile.rs +++ b/src/bin/generate_lockfile.rs @@ -1,7 +1,7 @@ use std::env; use cargo::ops; -use cargo::util::{CliResult, CliError, Config}; +use cargo::util::{CliResult, Config}; use cargo::util::important_paths::find_root_manifest_for_wd; #[derive(RustcDecodable)] @@ -32,6 +32,6 @@ pub fn execute(options: Options, config: &Config) -> CliResult> { try!(config.shell().set_color_config(options.flag_color.as_ref().map(|s| &s[..]))); let root = try!(find_root_manifest_for_wd(options.flag_manifest_path, config.cwd())); - ops::generate_lockfile(&root, config) - .map(|_| None).map_err(|err| CliError::from_boxed(err, 101)) + try!(ops::generate_lockfile(&root, config)); + Ok(None) } diff --git a/src/bin/login.rs b/src/bin/login.rs index bfcc2f8ae..2f60631d6 100644 --- a/src/bin/login.rs +++ b/src/bin/login.rs @@ -4,7 +4,7 @@ use std::io; use cargo::ops; use cargo::core::{SourceId, Source}; use cargo::sources::RegistrySource; -use cargo::util::{CliResult, CliError, Config}; +use cargo::util::{CliResult, Config, human, ChainError}; #[derive(RustcDecodable)] struct Options { @@ -36,28 +36,23 @@ pub fn execute(options: Options, config: &Config) -> CliResult> { let token = match options.arg_token.clone() { Some(token) => token, None => { - let err = (|| { - let src = try!(SourceId::for_central(config)); - let mut src = RegistrySource::new(&src, config); - try!(src.update()); - let config = try!(src.config()); - let host = options.flag_host.clone().unwrap_or(config.api); - println!("please visit {}me and paste the API Token below", - host); - let mut line = String::new(); - let input = io::stdin(); - try!(input.lock().read_line(&mut line)); - Ok(line) - })(); - - try!(err.map_err(|e| CliError::from_boxed(e, 101))) + let src = try!(SourceId::for_central(config)); + let mut src = RegistrySource::new(&src, config); + try!(src.update()); + let config = try!(src.config()); + let host = options.flag_host.clone().unwrap_or(config.api); + println!("please visit {}me and paste the API Token below", host); + let mut line = String::new(); + let input = io::stdin(); + try!(input.lock().read_line(&mut line).chain_error(|| { + human("failed to read stdin") + })); + line } }; let token = token.trim().to_string(); - try!(ops::registry_login(config, token).map_err(|e| { - CliError::from_boxed(e, 101) - })); + try!(ops::registry_login(config, token)); Ok(None) } diff --git a/src/bin/new.rs b/src/bin/new.rs index cc72b7411..5b0554af9 100644 --- a/src/bin/new.rs +++ b/src/bin/new.rs @@ -1,7 +1,7 @@ use std::env; use cargo::ops; -use cargo::util::{CliResult, CliError, Config}; +use cargo::util::{CliResult, Config}; #[derive(RustcDecodable)] struct Options { @@ -47,8 +47,7 @@ pub fn execute(options: Options, config: &Config) -> CliResult> { name: flag_name.as_ref().map(|s| s.as_ref()), }; - ops::new(opts, config).map(|_| None).map_err(|err| { - CliError::from_boxed(err, 101) - }) + try!(ops::new(opts, config)); + Ok(None) } diff --git a/src/bin/owner.rs b/src/bin/owner.rs index 74cf39e2e..b40fc3f69 100644 --- a/src/bin/owner.rs +++ b/src/bin/owner.rs @@ -1,5 +1,5 @@ use cargo::ops; -use cargo::util::{CliResult, CliError, Config}; +use cargo::util::{CliResult, Config}; #[derive(RustcDecodable)] struct Options { @@ -51,9 +51,7 @@ pub fn execute(options: Options, config: &Config) -> CliResult> { to_remove: options.flag_remove, list: options.flag_list, }; - try!(ops::modify_owners(config, &opts).map_err(|e| { - CliError::from_boxed(e, 101) - })); + try!(ops::modify_owners(config, &opts)); Ok(None) } diff --git a/src/bin/package.rs b/src/bin/package.rs index 63edc3bae..f5f89c35f 100644 --- a/src/bin/package.rs +++ b/src/bin/package.rs @@ -1,5 +1,5 @@ use cargo::ops; -use cargo::util::{CliResult, CliError, Config}; +use cargo::util::{CliResult, Config}; use cargo::util::important_paths::find_root_manifest_for_wd; #[derive(RustcDecodable)] @@ -35,10 +35,9 @@ pub fn execute(options: Options, config: &Config) -> CliResult> { try!(config.shell().set_verbosity(options.flag_verbose, options.flag_quiet)); try!(config.shell().set_color_config(options.flag_color.as_ref().map(|s| &s[..]))); let root = try!(find_root_manifest_for_wd(options.flag_manifest_path, config.cwd())); - ops::package(&root, config, - !options.flag_no_verify, - options.flag_list, - !options.flag_no_metadata).map(|_| None).map_err(|err| { - CliError::from_boxed(err, 101) - }) + try!(ops::package(&root, config, + !options.flag_no_verify, + options.flag_list, + !options.flag_no_metadata)); + Ok(None) } diff --git a/src/bin/pkgid.rs b/src/bin/pkgid.rs index b95294e0c..6446e1587 100644 --- a/src/bin/pkgid.rs +++ b/src/bin/pkgid.rs @@ -1,5 +1,5 @@ use cargo::ops; -use cargo::util::{CliResult, CliError, Config}; +use cargo::util::{CliResult, Config}; use cargo::util::important_paths::{find_root_manifest_for_wd}; #[derive(RustcDecodable)] @@ -52,9 +52,7 @@ pub fn execute(options: Options, let root = try!(find_root_manifest_for_wd(options.flag_manifest_path.clone(), config.cwd())); let spec = options.arg_spec.as_ref().map(|s| &s[..]); - let spec = try!(ops::pkgid(&root, spec, config).map_err(|err| { - CliError::from_boxed(err, 101) - })); + let spec = try!(ops::pkgid(&root, spec, config)); println!("{}", spec); Ok(None) } diff --git a/src/bin/publish.rs b/src/bin/publish.rs index d70043c0c..fdbbd4ffc 100644 --- a/src/bin/publish.rs +++ b/src/bin/publish.rs @@ -1,5 +1,5 @@ use cargo::ops; -use cargo::util::{CliResult, CliError, Config}; +use cargo::util::{CliResult, Config}; use cargo::util::important_paths::find_root_manifest_for_wd; #[derive(RustcDecodable)] @@ -43,7 +43,6 @@ pub fn execute(options: Options, config: &Config) -> CliResult> { } = options; let root = try!(find_root_manifest_for_wd(flag_manifest_path.clone(), config.cwd())); - ops::publish(&root, config, token, host, !no_verify).map(|_| None).map_err(|err| { - CliError::from_boxed(err, 101) - }) + try!(ops::publish(&root, config, token, host, !no_verify)); + Ok(None) } diff --git a/src/bin/read_manifest.rs b/src/bin/read_manifest.rs index 8fa60b646..1f1e09054 100644 --- a/src/bin/read_manifest.rs +++ b/src/bin/read_manifest.rs @@ -2,7 +2,7 @@ use std::env; use std::error::Error; use cargo::core::{Package, Source}; -use cargo::util::{CliResult, CliError, Config}; +use cargo::util::{CliResult, Config}; use cargo::util::important_paths::{find_root_manifest_for_wd}; use cargo::sources::{PathSource}; @@ -31,13 +31,9 @@ pub fn execute(options: Options, config: &Config) -> CliResult> let root = try!(find_root_manifest_for_wd(options.flag_manifest_path, config.cwd())); - let mut source = try!(PathSource::for_path(root.parent().unwrap(), config).map_err(|e| { - CliError::new(e.description(), 1) - })); + let mut source = try!(PathSource::for_path(root.parent().unwrap(), config)); + try!(source.update()); - try!(source.update().map_err(|err| CliError::new(err.description(), 1))); - - source.root_package() - .map(Some) - .map_err(|err| CliError::from_boxed(err, 1)) + let pkg = try!(source.root_package()); + Ok(Some(pkg)) } diff --git a/src/bin/rustc.rs b/src/bin/rustc.rs index 7eb86717e..14f9e120b 100644 --- a/src/bin/rustc.rs +++ b/src/bin/rustc.rs @@ -3,7 +3,7 @@ use std::env; use cargo::ops::CompileOptions; use cargo::ops; use cargo::util::important_paths::{find_root_manifest_for_wd}; -use cargo::util::{CliResult, CliError, Config}; +use cargo::util::{CliResult, Config}; #[derive(RustcDecodable)] struct Options { @@ -89,8 +89,7 @@ pub fn execute(options: Options, config: &Config) -> CliResult> { target_rustc_args: options.arg_opts.as_ref().map(|a| &a[..]), }; - ops::compile(&root, &opts).map(|_| None).map_err(|err| { - CliError::from_boxed(err, 101) - }) + try!(ops::compile(&root, &opts)); + Ok(None) } diff --git a/src/bin/search.rs b/src/bin/search.rs index 05c547585..93133a8dc 100644 --- a/src/bin/search.rs +++ b/src/bin/search.rs @@ -1,5 +1,5 @@ use cargo::ops; -use cargo::util::{CliResult, CliError, Config}; +use cargo::util::{CliResult, Config}; #[derive(RustcDecodable)] struct Options { @@ -34,7 +34,6 @@ pub fn execute(options: Options, config: &Config) -> CliResult> { .. } = options; - ops::search(&query, config, host) - .map(|_| None) - .map_err(|err| CliError::from_boxed(err, 101)) + try!(ops::search(&query, config, host)); + Ok(None) } diff --git a/src/bin/test.rs b/src/bin/test.rs index 532bf3501..789dc002b 100644 --- a/src/bin/test.rs +++ b/src/bin/test.rs @@ -95,10 +95,7 @@ pub fn execute(options: Options, config: &Config) -> CliResult> { }, }; - let err = try!(ops::run_tests(&root, &ops, - &options.arg_args).map_err(|err| { - CliError::from_boxed(err, 101) - })); + let err = try!(ops::run_tests(&root, &ops, &options.arg_args)); match err { None => Ok(None), Some(err) => { diff --git a/src/bin/update.rs b/src/bin/update.rs index 27842ba8d..92647cfcc 100644 --- a/src/bin/update.rs +++ b/src/bin/update.rs @@ -1,7 +1,7 @@ use std::env; use cargo::ops; -use cargo::util::{CliResult, CliError, Config}; +use cargo::util::{CliResult, Config}; use cargo::util::important_paths::find_root_manifest_for_wd; #[derive(RustcDecodable)] @@ -65,7 +65,7 @@ pub fn execute(options: Options, config: &Config) -> CliResult> { config: config, }; - ops::update_lockfile(&root, &update_opts) - .map(|_| None).map_err(|err| CliError::from_boxed(err, 101)) + try!(ops::update_lockfile(&root, &update_opts)); + Ok(None) } diff --git a/src/bin/yank.rs b/src/bin/yank.rs index e672898a3..f9812154b 100644 --- a/src/bin/yank.rs +++ b/src/bin/yank.rs @@ -1,5 +1,5 @@ use cargo::ops; -use cargo::util::{CliResult, CliError, Config}; +use cargo::util::{CliResult, Config}; #[derive(RustcDecodable)] struct Options { @@ -46,9 +46,7 @@ pub fn execute(options: Options, config: &Config) -> CliResult> { options.flag_vers, options.flag_token, options.flag_index, - options.flag_undo).map_err(|e| { - CliError::from_boxed(e, 101) - })); + options.flag_undo)); Ok(None) } -- 2.30.2